reftests: Actually build a module

Reftests are expecting a module called libreftest.so, so don't build a
static libgtkreftest.a but what they expect.

diff --git a/testsuite/reftests/gtk-reftest.h b/testsuite/reftests/gtk-reftest.h
index e30c78f0ea092817da2f6bbd3020bdbaeeba4a5d..e4da797626ebb687da8535aad791941b6b240f72 100644 (file)
--- a/testsuite/reftests/gtk-reftest.h
+++ b/testsuite/reftests/gtk-reftest.h
@@ -21,8 +21,8 @@
 G_BEGIN_DECLS
 
 /* reftest-snapshot.c */
-void reftest_inhibit_snapshot   (void);
-void reftest_uninhibit_snapshot (void);
+extern void reftest_inhibit_snapshot   (void);
+extern void reftest_uninhibit_snapshot (void);
 
 G_END_DECLS
 

diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 7b758ca5505ce10e3d67ed2553bc87ec93c2d1ba..de8176b1c4f34c46db8227e9f11bd9af70b977c7 100644 (file)
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -3,15 +3,17 @@ libgtkreftestprivate = static_library('gtkreftestprivate',
   'reftest-compare.c', 'reftest-module.c', 'reftest-snapshot.c',
   dependencies : libgtk_dep)
 
-libreftest = static_library('gtkreftest',
-  'expand-expander.c',
-  'frame-inhibitor.c',
-  'letter-spacing.c',
-  'set-default-direction.c',
-  'statusbar-remove-all.c',
-  'textview-border-windows.c',
-  'textview-tags.c',
-  'animation-direction.c',
+libreftest = shared_module('reftest',
+  [ 'expand-expander.c',
+    'frame-inhibitor.c',
+    'letter-spacing.c',
+    'set-default-direction.c',
+    'statusbar-remove-all.c',
+    'textview-border-windows.c',
+    'textview-tags.c',
+    'animation-direction.c',
+  ],
+  link_with: libgtkreftestprivate,
   dependencies : libgtk_dep)
 
 tcdata = configuration_data()
@@ -428,13 +430,13 @@ foreach testname : testdata
        args: [ '--tap', '-k', '--verbose', join_paths(meson.current_source_dir(), testname) ],
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
               'GSETTINGS_BACKEND=memory',
-              'GSETTINGS_SCHEMA_DIR=@@'.format(gtk_schema_build_dir),
+              'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
               'GTK_CSD=1',
               'G_ENABLE_DIAGNOSTIC=0',
               'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
               'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
               'GSK_RENDERER=opengl',
-              'REFTEST_MODULE_DIR=@@'.format(meson.current_build_dir()),
+              'REFTEST_MODULE_DIR=@0@'.format(meson.current_build_dir()),
             ],
        suite: 'reftest')
 endforeach